From b79f86fed929f46b054a31ad95c15c12ca5b3737 Mon Sep 17 00:00:00 2001 From: "ryanh@us.ibm.com[iap10]" Date: Mon, 18 Apr 2005 21:29:44 +0000 Subject: [PATCH] bitkeeper revision 1.1159.258.101 (426426c8abaWsVEeXnAJoNNGZ6ooyg) [PATCH] [PATCH] xen: is_idle_task cleanup The macro is_idle_task references d_flags which is only in struct domain. When WAKE_HISTO or BLOCKTIME_HISTO are defined (in schedule.c) xen fails to compile with out the attached patch. Signed-off-by: Ryan Harper --- BitKeeper/etc/logging_ok | 1 + xen/common/schedule.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f5ca0d0fc9..eff426464d 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -57,6 +57,7 @@ rn@wyvis.camb.intel-research.net rn@wyvis.research.intel-research.net rneugeba@wyvis.research rneugeba@wyvis.research.intel-research.net +ryanh@us.ibm.com sd386@font.cl.cam.ac.uk shand@spidean.research.intel-research.net smh22@boulderdash.cl.cam.ac.uk diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 0470f9ee17..0c437d8834 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -364,7 +364,7 @@ static void __enter_scheduler(void) cleanup_writable_pagetable(prev); #if defined(WAKE_HISTO) - if ( !is_idle_task(next) && next->wokenup ) { + if ( !is_idle_task(next->domain) && next->wokenup ) { ulong diff = (ulong)(now - next->wokenup); diff /= (ulong)MILLISECS(1); if (diff <= BUCKETS-2) schedule_data[cpu].hist[diff]++; @@ -373,7 +373,7 @@ static void __enter_scheduler(void) next->wokenup = (s_time_t)0; #elif defined(BLOCKTIME_HISTO) prev->lastdeschd = now; - if ( !is_idle_task(next) ) + if ( !is_idle_task(next->domain) ) { ulong diff = (ulong)((now - next->lastdeschd) / MILLISECS(10)); if (diff <= BUCKETS-2) schedule_data[cpu].hist[diff]++; -- 2.30.2